Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 9 Jan 2006 14:43:46 +0000 (14:43 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 9 Jan 2006 14:43:46 +0000 (14:43 +0000)
commit65f50982bc9a5ae36266e0e7bf55c174a5ae7fda
tree60cd76c9b7efd99c77e76b4950cf912b3b7c9904
parentd8d1f1f6c57a395892fc3e3a39075e1079c1b9bd
parent9652e9b451e7055fb8a11f74a39f719d150cc653
Merged.